From: Yuri Astrakhan <yurik@users.mediawiki.org>
Date: Sun, 17 Jun 2007 08:25:16 +0000 (+0000)
Subject: API: Fixed regression bug 10274: generator=watchlist complains about gwlprop even... 
X-Git-Tag: 1.31.0-rc.0~52526
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=7938936806bb6d94f8d41964f7798ee00a4463dd;p=lhc%2Fweb%2Fwiklou.git

API: Fixed regression bug 10274: generator=watchlist complains about gwlprop even if it's not set
Thanks to Roan Kattouw
---

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index f61a769170..245c04a2df 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -62,9 +62,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 		$allrev = $start = $end = $namespace = $dir = $limit = $prop = null;
 		extract($this->extractRequestParams());
 
-		if (!is_null($prop)) {
-			if (!is_null($resultPageSet))
-				$this->dieUsage($this->encodeParamName('prop') . ' parameter may not be used in a generator', 'params');
+		if (!is_null($prop) && is_null($resultPageSet)) {
 
 			$prop = array_flip($prop);